Fix bug #55573

Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573

diff --git a/ChangeLog b/ChangeLog
index 98240ecd0c4adcaea254b156bc857e661e761f58..49973b23e1acec7c77634f3e6ea5e7cf82af9220 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573
+
 Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.h: Deprecate gtk_widget_set().

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 98240ecd0c4adcaea254b156bc857e661e761f58..49973b23e1acec7c77634f3e6ea5e7cf82af9220 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573
+
 Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.h: Deprecate gtk_widget_set().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 98240ecd0c4adcaea254b156bc857e661e761f58..49973b23e1acec7c77634f3e6ea5e7cf82af9220 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573
+
 Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.h: Deprecate gtk_widget_set().

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 98240ecd0c4adcaea254b156bc857e661e761f58..49973b23e1acec7c77634f3e6ea5e7cf82af9220 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573
+
 Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.h: Deprecate gtk_widget_set().

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 98240ecd0c4adcaea254b156bc857e661e761f58..49973b23e1acec7c77634f3e6ea5e7cf82af9220 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573
+
 Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.h: Deprecate gtk_widget_set().

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 98240ecd0c4adcaea254b156bc857e661e761f58..49973b23e1acec7c77634f3e6ea5e7cf82af9220 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573
+
 Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.h: Deprecate gtk_widget_set().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 98240ecd0c4adcaea254b156bc857e661e761f58..49973b23e1acec7c77634f3e6ea5e7cf82af9220 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue Jun  5 14:57:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_size): Fix bug #55573
+
 Mon Jun  4 12:41:25 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.h: Deprecate gtk_widget_set().

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 72737f736471d127869e8cd64a864796eb55b6b0..c67850cf09981deeb6cfadabcd814aaf6ff239f4 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1334,7 +1334,7 @@ gtk_tree_view_column_set_sizing (GtkTreeViewColumn       *tree_column,
  * 
  * Return value: The type of @tree_column.
  **/
-gint
+GtkTreeViewColumnSizing
 gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (tree_column != NULL, 0);

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 65e2eb8b288598017e379625e14ddf6db419db61..572d8949a970a98b9bed2d8c63e8efcf190f8fe6 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -105,99 +105,102 @@ struct _GtkTreeViewColumnClass
   void (*clicked) (GtkTreeViewColumn *tree_column);
 };
 
+GtkType                 gtk_tree_view_column_get_type            (void);
+GtkTreeViewColumn    *  gtk_tree_view_column_new                 (void);
+GtkTreeViewColumn    *  gtk_tree_view_column_new_with_attributes (const gchar             *title,
+                                                                 GtkCellRenderer         *cell,
+                                                                 ...);
+void                    gtk_tree_view_column_set_cell_renderer   (GtkTreeViewColumn       *tree_column,
+                                                                 GtkCellRenderer         *cell);
+GtkCellRenderer      *  gtk_tree_view_column_get_cell_renderer   (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
+                                                                 const gchar             *attribute,
+                                                                 gint                     column);
+void                    gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
+                                                                 ...);
+void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn       *tree_column,
+                                                                 GtkTreeCellDataFunc      func,
+                                                                 gpointer                 func_data,
+                                                                 GtkDestroyNotify         destroy);
+void                    gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_visible         (GtkTreeViewColumn       *tree_column,
+                                                                 gboolean                 visible);
+gboolean                gtk_tree_view_column_get_visible         (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_sizing          (GtkTreeViewColumn       *tree_column,
+                                                                 GtkTreeViewColumnSizing  type);
+GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing          (GtkTreeViewColumn       *tree_column);
+gint                    gtk_tree_view_column_get_width           (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_width           (GtkTreeViewColumn       *tree_column,
+                                                                 gint                     size);
+void                    gtk_tree_view_column_set_min_width       (GtkTreeViewColumn       *tree_column,
+                                                                 gint                     min_width);
+gint                    gtk_tree_view_column_get_min_width       (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_max_width       (GtkTreeViewColumn       *tree_column,
+                                                                 gint                     max_width);
+gint                    gtk_tree_view_column_get_max_width       (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_clicked             (GtkTreeViewColumn       *tree_column);
 
-GtkType               gtk_tree_view_column_get_type            (void);
-GtkTreeViewColumn    *gtk_tree_view_column_new                 (void);
-GtkTreeViewColumn    *gtk_tree_view_column_new_with_attributes (const gchar             *title,
-                                                               GtkCellRenderer         *cell,
-                                                               ...);
-void                  gtk_tree_view_column_set_cell_renderer   (GtkTreeViewColumn       *tree_column,
-                                                               GtkCellRenderer         *cell);
-GtkCellRenderer      *gtk_tree_view_column_get_cell_renderer   (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
-                                                               const gchar             *attribute,
-                                                               gint                     column);
-void                  gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
-                                                               ...);
-void                  gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn       *tree_column,
-                                                               GtkTreeCellDataFunc      func,
-                                                               gpointer                 func_data,
-                                                               GtkDestroyNotify         destroy);
-void                  gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_visible         (GtkTreeViewColumn       *tree_column,
-                                                               gboolean                 visible);
-gboolean              gtk_tree_view_column_get_visible         (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_sizing          (GtkTreeViewColumn       *tree_column,
-                                                               GtkTreeViewColumnSizing  type);
-gint                  gtk_tree_view_column_get_sizing          (GtkTreeViewColumn       *tree_column);
-gint                  gtk_tree_view_column_get_width           (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_width           (GtkTreeViewColumn       *tree_column,
-                                                               gint                     size);
-void                  gtk_tree_view_column_set_min_width       (GtkTreeViewColumn       *tree_column,
-                                                               gint                     min_width);
-gint                  gtk_tree_view_column_get_min_width       (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_max_width       (GtkTreeViewColumn       *tree_column,
-                                                               gint                     max_width);
-gint                  gtk_tree_view_column_get_max_width       (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_clicked             (GtkTreeViewColumn       *tree_column);
 
 
 /* Options for manipulating the column headers
  */
-void                  gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
-                                                               const gchar             *title);
-G_CONST_RETURN gchar *gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_clickable       (GtkTreeViewColumn       *tree_column,
-                                                               gboolean                 clickable);
-gboolean              gtk_tree_view_column_get_clickable       (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_widget          (GtkTreeViewColumn       *tree_column,
-                                                               GtkWidget               *widget);
-GtkWidget            *gtk_tree_view_column_get_widget          (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_alignment       (GtkTreeViewColumn       *tree_column,
-                                                               gfloat                   xalign);
-gfloat                gtk_tree_view_column_get_alignment       (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_reorderable     (GtkTreeViewColumn       *tree_column,
-                                                               gboolean                 reorderable);
-gboolean              gtk_tree_view_column_get_reorderable     (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
+                                                                 const gchar             *title);
+G_CONST_RETURN gchar *  gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_clickable       (GtkTreeViewColumn       *tree_column,
+                                                                 gboolean                 clickable);
+gboolean                gtk_tree_view_column_get_clickable       (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_widget          (GtkTreeViewColumn       *tree_column,
+                                                                 GtkWidget               *widget);
+GtkWidget            *  gtk_tree_view_column_get_widget          (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_alignment       (GtkTreeViewColumn       *tree_column,
+                                                                 gfloat                   xalign);
+gfloat                  gtk_tree_view_column_get_alignment       (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_reorderable     (GtkTreeViewColumn       *tree_column,
+                                                                 gboolean                 reorderable);
+gboolean                gtk_tree_view_column_get_reorderable     (GtkTreeViewColumn       *tree_column);
+
 
 
 /* You probably only want to use gtk_tree_view_column_set_sort_column_id.  The
  * other sorting functions exist primarily to let others do their own custom sorting.
  */
-void                  gtk_tree_view_column_set_sort_column_id  (GtkTreeViewColumn       *tree_column,
-                                                               gint                     sort_column_id);
-void                  gtk_tree_view_column_set_sort_indicator  (GtkTreeViewColumn       *tree_column,
-                                                               gboolean                 setting);
-gboolean              gtk_tree_view_column_get_sort_indicator  (GtkTreeViewColumn       *tree_column);
-void                  gtk_tree_view_column_set_sort_order      (GtkTreeViewColumn       *tree_column,
-                                                               GtkTreeSortOrder         order);
-GtkTreeSortOrder      gtk_tree_view_column_get_sort_order      (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_sort_column_id  (GtkTreeViewColumn       *tree_column,
+                                                                 gint                     sort_column_id);
+void                    gtk_tree_view_column_set_sort_indicator  (GtkTreeViewColumn       *tree_column,
+                                                                 gboolean                 setting);
+gboolean                gtk_tree_view_column_get_sort_indicator  (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_sort_order      (GtkTreeViewColumn       *tree_column,
+                                                                 GtkTreeSortOrder         order);
+GtkTreeSortOrder        gtk_tree_view_column_get_sort_order      (GtkTreeViewColumn       *tree_column);
+
 
 
 
 /* These functions are meant primarily for interaction between the GtkTreeView and the column.
  */
-void                  gtk_tree_view_column_cell_set_cell_data  (GtkTreeViewColumn       *tree_column,
-                                                               GtkTreeModel            *tree_model,
-                                                               GtkTreeIter             *iter);
-void                  gtk_tree_view_column_cell_get_size       (GtkTreeViewColumn       *tree_column,
-                                                               GdkRectangle            *cell_area,
-                                                               gint                    *x_offset,
-                                                               gint                    *y_offset,
-                                                               gint                    *width,
-                                                               gint                    *height);
-void                  gtk_tree_view_column_cell_render         (GtkTreeViewColumn       *tree_column,
-                                                               GdkWindow               *window,
-                                                               GdkRectangle            *background_area,
-                                                               GdkRectangle            *cell_area,
-                                                               GdkRectangle            *expose_area,
-                                                               guint                    flags);
-gboolean              gtk_tree_view_column_cell_event          (GtkTreeViewColumn       *tree_column,
-                                                               GdkEvent                *event,
-                                                               gchar                   *path_string,
-                                                               GdkRectangle            *background_area,
-                                                               GdkRectangle            *cell_area,
-                                                               guint                    flags);
+void                    gtk_tree_view_column_cell_set_cell_data  (GtkTreeViewColumn       *tree_column,
+                                                                 GtkTreeModel            *tree_model,
+                                                                 GtkTreeIter             *iter);
+void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewColumn       *tree_column,
+                                                                 GdkRectangle            *cell_area,
+                                                                 gint                    *x_offset,
+                                                                 gint                    *y_offset,
+                                                                 gint                    *width,
+                                                                 gint                    *height);
+void                    gtk_tree_view_column_cell_render         (GtkTreeViewColumn       *tree_column,
+                                                                 GdkWindow               *window,
+                                                                 GdkRectangle            *background_area,
+                                                                 GdkRectangle            *cell_area,
+                                                                 GdkRectangle            *expose_area,
+                                                                 guint                    flags);
+gboolean                gtk_tree_view_column_cell_event          (GtkTreeViewColumn       *tree_column,
+                                                                 GdkEvent                *event,
+                                                                 gchar                   *path_string,
+                                                                 GdkRectangle            *background_area,
+                                                                 GdkRectangle            *cell_area,
+                                                                 guint                    flags);
+